x11: Stop using gdk_surface_get_state
authorMatthias Clasen <mclasen@redhat.com>
Sun, 1 Mar 2020 01:43:34 +0000 (20:43 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 12 Mar 2020 18:56:20 +0000 (14:56 -0400)
All the surfaces we are dealing with here are toplevels.

gdk/x11/gdkdisplay-x11.c
gdk/x11/gdkmonitor-x11.c
gdk/x11/gdksurface-x11.c

index e5e367eb30adc45015bd4e03cae7f7a824a0453d..040844b247ac0901142bd567996407becebbf9cf 100644 (file)
@@ -378,7 +378,7 @@ do_net_wm_state_changes (GdkSurface *surface)
       gdk_surface_get_surface_type (surface) != GDK_SURFACE_TOPLEVEL)
     return;
 
-  old_state = gdk_surface_get_state (surface);
+  old_state = gdk_toplevel_get_state (GDK_TOPLEVEL (surface));
 
   set = unset = 0;
 
index 970095c11d2237d8954b1288ded1a967caa88333..341917ad8cc4773f8e1099025f54ddb1cfb57c32 100644 (file)
@@ -44,7 +44,7 @@ gdk_monitor_has_fullscreen_window (GdkMonitor *monitor)
     {
       surface = l->data;
 
-      if ((gdk_surface_get_state (surface) & GDK_SURFACE_STATE_FULLSCREEN) == 0)
+      if ((gdk_toplevel_get_state (GDK_TOPLEVEL (surface)) & GDK_SURFACE_STATE_FULLSCREEN) == 0)
         continue;
 
       if (gdk_surface_get_fullscreen_mode (surface) == GDK_FULLSCREEN_ON_ALL_MONITORS ||
index e3d39a3df3fa74420999b9f7ffda32e27340742c..ab65449f2bf2497e5dbba91a01c95f79f448d624 100644 (file)
@@ -3894,7 +3894,7 @@ check_maximize (MoveResizeData *mv_resize,
   if (mv_resize->is_resize)
     return;
 
-  state = gdk_surface_get_state (mv_resize->moveresize_surface);
+  state = gdk_toplevel_get_state (GDK_TOPLEVEL (mv_resize->moveresize_surface));
 
   if (state & GDK_SURFACE_STATE_MAXIMIZED)
     return;
@@ -3916,7 +3916,7 @@ check_unmaximize (MoveResizeData *mv_resize,
   if (mv_resize->is_resize)
     return;
 
-  state = gdk_surface_get_state (mv_resize->moveresize_surface);
+  state = gdk_toplevel_get_state (GDK_TOPLEVEL (mv_resize->moveresize_surface));
 
   if ((state & (GDK_SURFACE_STATE_MAXIMIZED | GDK_SURFACE_STATE_TILED)) == 0)
     return;